Reinstate the ruler metrics strings, since they are used by glade, pointed

2006-05-12  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkruler.c: Reinstate the ruler metrics strings, since
	they are used by glade, pointed out by Damon Chaplin.

diff --git a/ChangeLog b/ChangeLog
index 39dc429ae4ccc0243a8e340217bd973f5164c47e..0445a5a62cab0f3182094eec7bfc8ea4eef82978 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkruler.c: Reinstate the ruler metrics strings, since
+       they are used by glade, pointed out by Damon Chaplin.
+
 2006-05-12  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkwindow.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 39dc429ae4ccc0243a8e340217bd973f5164c47e..0445a5a62cab0f3182094eec7bfc8ea4eef82978 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-05-12  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkruler.c: Reinstate the ruler metrics strings, since
+       they are used by glade, pointed out by Damon Chaplin.
+
 2006-05-12  Alexander Larsson  <alexl@redhat.com>
 
        * gtk/gtkwindow.c:

diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c
index e6a4a0e357f0e6ad54d241f6f0d6dc00b5e3b897..1655d1888cf2b3b07d4a7747eb5cc42b161520ca 100644 (file)
--- a/gtk/gtkruler.c
+++ b/gtk/gtkruler.c
@@ -57,9 +57,9 @@ static void gtk_ruler_get_property  (GObject        *object,
 
 static const GtkRulerMetric ruler_metrics[] =
 {
-  { NULL, NULL, 1.0, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-  { NULL, NULL, 72.0, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }},
-  { NULL, NULL, 28.35, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
+  { "Pixel", "Pi", 1.0, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
+  { "Inches", "In", 72.0, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }},
+  { "Centimeters", "Cn", 28.35, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
 };
 
 G_DEFINE_TYPE (GtkRuler, gtk_ruler, GTK_TYPE_WIDGET);